From: Kim F. Storm <storm@cua.dk>
Date: Sun, 25 Jul 2004 22:15:03 +0000 (+0000)
Subject: (move_it_in_display_line_to): If overflow-newline-into-fringe
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21528
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=14082caebd4c6e98c924d81881b8eeceb685e039;p=emacs.git

(move_it_in_display_line_to): If overflow-newline-into-fringe
is enabled, return MOVE_LINE_CONTINUED rather than MOVE_POS_MATCH_OR_ZV
if target position is at end of display line but char is not a newline.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 4083ce7a438..071e85ae29d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5738,12 +5738,19 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
 #ifdef HAVE_WINDOW_SYSTEM
 			  if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
 			    {
-			      if (!get_next_display_element (it)
-				  || BUFFER_POS_REACHED_P ())
+			      if (!get_next_display_element (it))
 				{
 				  result = MOVE_POS_MATCH_OR_ZV;
 				  break;
 				}
+			      if (BUFFER_POS_REACHED_P ())
+				{
+				  if (ITERATOR_AT_END_OF_LINE_P (it))
+				    result = MOVE_POS_MATCH_OR_ZV;
+				  else
+				    result = MOVE_LINE_CONTINUED;
+				  break;
+				}
 			      if (ITERATOR_AT_END_OF_LINE_P (it))
 				{
 				  result = MOVE_NEWLINE_OR_CR;